[FINE] Porting newly supported Tower credential types to Fine #15780

jameswnl · 2017-08-09T17:56:10Z

Backporting via cherrypick proved to be complicated with too many conflicts. Instead this PR is created to port the feature to Fine and that effectively contains the following

The following are original PRs for masters (manageiq repo and manageiq-provider-ansible_tower repo) and their corresponding commits in this PR.

master PRs	corresponding commits
Re-record vcr cassette and spec update, plus a script to generate Tower objects	re-record tower refresher cassette
New Tower credential types	support other credential types of Tower
Azure Classic credential added / Specs added for azure-classic-credential	add azure_classic_credential, plus spec update
Backport? (copy) the applicable parts of "New Tower credential types" / Azure Classic Credential added for embedded Ansible	add newly supported Tower credentials to embedded_ansible

The following 2 PRs are 1-liners that are included in the commits.

jameswnl · 2017-08-10T14:14:54Z

@miq-bot add_label wip

jameswnl · 2017-08-14T21:53:54Z

@miq-bot remove_label wip

durandom

LGTM

agrare

@jameswnl Its realistically impossible to confirm that +13,656 −3,439 worth of changes is the same as in master

Can you try to at do these one PR at a time even if not cherry-picked?

durandom · 2017-08-24T14:03:09Z

I was glancing at all PRs listed in the description and had a quick look if they are included in here. So at least I tried to check :) But I'm with @agrare that it's not really 100% sure.

jameswnl · 2017-09-14T15:36:41Z

@agrare @durandom my PR have commits that (roughly) correspond to the original PRs. I've updated the PR description with the mappings.

(It's not an exact match because of the split of repos after Fine.)

durandom

@agrare as said in my previous comment, I looked at all individual commits and glanced over the corresponding PRs - so I'm 👍 with this PR as is

agrare

LGTM 👍
ping @simaishi

simaishi · 2017-09-15T17:20:22Z

Since this isn't a blocker, I'll get this in later when we start working on the next release.

durandom · 2017-09-18T12:12:51Z

Since this isn't a blocker, I'll get this in later when we start working on the next release.

@jameswnl prepare for more rebasing 😆

miq-bot · 2017-11-02T17:26:46Z

Some comments on commits jameswnl/manageiq@4305c94~...95767b1

lib/tasks_private/spec_helper.rake

⚠️ - 114 - Detected puts. Remove all debugging statements.
⚠️ - 189 - Detected puts. Remove all debugging statements.
⚠️ - 195 - Detected puts. Remove all debugging statements.
⚠️ - 205 - Detected puts. Remove all debugging statements.
⚠️ - 66 - Detected puts. Remove all debugging statements.
⚠️ - 74 - Detected puts. Remove all debugging statements.

miq-bot · 2017-11-02T17:27:57Z

Checked commits jameswnl/manageiq@4305c94~...95767b1 with ruby 2.3.3, rubocop 0.47.1, and haml-lint 0.20.0
33 files checked, 54 offenses detected

app/models/manageiq/providers/ansible_tower/shared/automation_manager/azure_credential.rb

❗ - Line 10, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 22, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 28, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 34, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 3, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 4, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 5, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 8, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 9, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.

app/models/manageiq/providers/ansible_tower/shared/automation_manager/google_credential.rb

❗ - Line 13, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 14, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 15, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 16, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 19, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.

app/models/manageiq/providers/ansible_tower/shared/automation_manager/network_credential.rb

app/models/manageiq/providers/ansible_tower/shared/automation_manager/openstack_credential.rb

❗ - Line 17, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 31, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 3, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.

app/models/manageiq/providers/ansible_tower/shared/automation_manager/rackspace_credential.rb

❗ - Line 3, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.

app/models/manageiq/providers/ansible_tower/shared/automation_manager/satellite6_credential.rb

❗ - Line 10, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 11, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 12, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 3, Col 5 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 4, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 5, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 6, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
❗ - Line 9, Col 7 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.

app/models/manageiq/providers/ansible_tower/shared/inventory/parser/automation_manager.rb

❗ - Line 91, Col 33 - Style/CaseIndentation - Indent when as deep as case.

lib/tasks_private/spec_helper.rake

💣 💥 🔥 🚒 - Line 101, Col 39 - Syntax - unexpected token tIDENTIFIER
(Using Ruby 2.2 parser; configure using TargetRubyVersion parameter, under AllCops)
💣 💥 🔥 🚒 - Line 109, Col 25 - Syntax - unexpected token tCONSTANT
(Using Ruby 2.2 parser; configure using TargetRubyVersion parameter, under AllCops)
💣 💥 🔥 🚒 - Line 111, Col 10 - Syntax - unexpected token klEND
(Using Ruby 2.2 parser; configure using TargetRubyVersion parameter, under AllCops)
💣 💥 🔥 🚒 - Line 84, Col 20 - Syntax - unexpected token tLSHFT
(Using Ruby 2.2 parser; configure using TargetRubyVersion parameter, under AllCops)
💣 💥 🔥 🚒 - Line 85, Col 10 - Syntax - unexpected token klBEGIN
(Using Ruby 2.2 parser; configure using TargetRubyVersion parameter, under AllCops)
💣 💥 🔥 🚒 - Line 88, Col 58 - Syntax - unexpected token tCONSTANT
(Using Ruby 2.2 parser; configure using TargetRubyVersion parameter, under AllCops)
💣 💥 🔥 🚒 - Line 92, Col 65 - Syntax - unexpected token tIDENTIFIER
(Using Ruby 2.2 parser; configure using TargetRubyVersion parameter, under AllCops)
💣 💥 🔥 🚒 - Line 97, Col 6 - Syntax - unexpected token tCONSTANT
(Using Ruby 2.2 parser; configure using TargetRubyVersion parameter, under AllCops)

spec/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-ansible_tower-automation_manager-azure_classic_credential_spec.rb

❗ - Line 1, Col 1 - Style/FileName - The name of this source file (miq_ae_service_manageiq-providers-ansible_tower-automation_manager-azure_classic_credential_spec.rb) should use snake_case.

cben · 2017-11-28T08:34:14Z

Travis errors are the ones fixed by #16531, if you close/open it should pass.

porting spec_helper.rake to fine

4305c94

miq-bot changed the title ~~porting spec_helper.rake to fine~~ [FINE] porting spec_helper.rake to fine Aug 9, 2017

simaishi requested a review from blomquisg August 9, 2017 18:08

simaishi self-assigned this Aug 9, 2017

miq-bot added the providers/ansible_tower label Aug 9, 2017

support other credential types of Tower

da4ab29

jameswnl force-pushed the cred-fine branch from e007fbe to da4ab29 Compare August 9, 2017 18:58

jameswnl added 4 commits August 9, 2017 15:52

port Tower refresher spec

d95b5fa

add azure_classic_credential, plus spec update

0b7347b

add newly supported Tower credentials to embedded_ansible

1c573c4

new azure_classic_credential service model

c52fd75

jameswnl changed the title ~~[FINE] porting spec_helper.rake to fine~~ [FINE] Porting newly supported Tower credential types to Fine Aug 10, 2017

jameswnl force-pushed the cred-fine branch from 94ad1cd to 6b45016 Compare August 10, 2017 14:14

jameswnl changed the title ~~[FINE] Porting newly supported Tower credential types to Fine~~ [WIP] [FINE] Porting newly supported Tower credential types to Fine Aug 10, 2017

miq-bot added the wip label Aug 10, 2017

re-record tower refresher cassette

95767b1

jameswnl force-pushed the cred-fine branch from 4f23de7 to 95767b1 Compare August 14, 2017 20:50

jameswnl changed the title ~~[WIP] [FINE] Porting newly supported Tower credential types to Fine~~ [FINE] Porting newly supported Tower credential types to Fine Aug 14, 2017

miq-bot removed the wip label Aug 14, 2017

simaishi requested review from durandom and agrare August 14, 2017 22:10

durandom approved these changes Aug 15, 2017

View reviewed changes

agrare requested changes Aug 23, 2017

View reviewed changes

durandom approved these changes Sep 15, 2017

View reviewed changes

agrare approved these changes Sep 15, 2017

View reviewed changes

blomquisg approved these changes Sep 18, 2017

View reviewed changes

jameswnl closed this Nov 2, 2017

jameswnl deleted the cred-fine branch November 2, 2017 17:09

jameswnl restored the cred-fine branch November 2, 2017 17:21

jameswnl reopened this Nov 2, 2017

simaishi closed this Nov 20, 2017

simaishi reopened this Nov 20, 2017

jameswnl closed this Nov 28, 2017

jameswnl reopened this Nov 28, 2017

simaishi merged commit 79f6f95 into ManageIQ:fine Nov 28, 2017

simaishi added this to the Sprint 75 Ending Dec 11, 2017 milestone Nov 28, 2017

Fryguy added the providers/automation label Jan 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FINE] Porting newly supported Tower credential types to Fine #15780

[FINE] Porting newly supported Tower credential types to Fine #15780

jameswnl commented Aug 9, 2017 •

edited

Loading

jameswnl commented Aug 10, 2017

jameswnl commented Aug 14, 2017

durandom left a comment

agrare left a comment

durandom commented Aug 24, 2017

jameswnl commented Sep 14, 2017

durandom left a comment

agrare left a comment

simaishi commented Sep 15, 2017

durandom commented Sep 18, 2017

miq-bot commented Nov 2, 2017

miq-bot commented Nov 2, 2017

cben commented Nov 28, 2017

[FINE] Porting newly supported Tower credential types to Fine #15780

[FINE] Porting newly supported Tower credential types to Fine #15780

Conversation

jameswnl commented Aug 9, 2017 • edited Loading

jameswnl commented Aug 10, 2017

jameswnl commented Aug 14, 2017

durandom left a comment

Choose a reason for hiding this comment

agrare left a comment

Choose a reason for hiding this comment

durandom commented Aug 24, 2017

jameswnl commented Sep 14, 2017

durandom left a comment

Choose a reason for hiding this comment

agrare left a comment

Choose a reason for hiding this comment

simaishi commented Sep 15, 2017

durandom commented Sep 18, 2017

miq-bot commented Nov 2, 2017

miq-bot commented Nov 2, 2017

cben commented Nov 28, 2017

jameswnl commented Aug 9, 2017 •

edited

Loading